From: Jochen Sprickerhof Date: Thu, 30 May 2019 10:31:08 +0000 (+0200) Subject: Rebase patches X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~112 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=d2ce2fbbf15eb67d14c2d907780e49153ab37298;p=gpsbabel.git Rebase patches --- diff --git a/debian/patches/fix-qt5-build b/debian/patches/fix-qt5-build deleted file mode 100644 index 798a1e7ff..000000000 --- a/debian/patches/fix-qt5-build +++ /dev/null @@ -1,144 +0,0 @@ ---- a/gpx.cc -+++ b/gpx.cc -@@ -494,7 +494,7 @@ tag_cache_desc(const QXmlStreamAttribute - { - cache_descr_is_html = 0; - if (attr.hasAttribute("html")) { -- if (attr.value("html").toString().compare("True") == 0) { -+ if (attr.value("html").toString().compare(QString("True")) == 0) { - cache_descr_is_html = 1; - } - } -@@ -509,16 +509,16 @@ tag_gs_cache(const QXmlStreamAttributes& - gc_data->id = attr.value("id").toString().toInt(); - } - if (attr.hasAttribute("available")) { -- if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) { -+ if (attr.value("available").toString().compare(QString("True"), Qt::CaseInsensitive) == 0) { - gc_data->is_available = status_true; -- } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) { -+ } else if (attr.value("available").toString().compare(QString("False"), Qt::CaseInsensitive) == 0) { - gc_data->is_available = status_false; - } - } - if (attr.hasAttribute("archived")) { -- if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) { -+ if (attr.value("archived").toString().compare(QString("True"), Qt::CaseInsensitive) == 0) { - gc_data->is_archived = status_true; -- } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) { -+ } else if (attr.value("archived").toString().compare(QString("False"), Qt::CaseInsensitive) == 0) { - gc_data->is_archived = status_false; - } - } -@@ -972,7 +972,7 @@ gpx_end(const QString& el) - * last date we saw in this log. - */ - case tt_cache_log_type: -- if ((cdatastr.compare("Found it") == 0) && -+ if ((cdatastr.compare(QString("Found it")) == 0) && - (0 == wpt_tmp->gc_data->last_found.toTime_t())) { - wpt_tmp->AllocGCData()->last_found = gc_log_date; - } -@@ -1423,7 +1423,7 @@ fprint_xml_chain(xml_tag* tag, const Way - fprint_xml_chain(tag->child, wpt); - } - if (wpt && wpt->gc_data->exported.isValid() && -- tag->tagname.compare("groundspeak:cache") == 0) { -+ tag->tagname.compare(QString("groundspeak:cache")) == 0) { - writer->writeTextElement("time", - wpt->gc_data->exported.toPrettyString()); - } ---- a/tef_xml.cc -+++ b/tef_xml.cc -@@ -72,11 +72,11 @@ tef_start(xg_string args, const QXmlStre - bool valid = false; - - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) { -- if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("Comment"), Qt::CaseInsensitive) == 0) { -+ if (attr.value().compare(QString("TourExchangeFormat"), Qt::CaseInsensitive) == 0) { - valid = true; - } -- } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Version"), Qt::CaseInsensitive) == 0) { - version = attr.value().toString().toDouble(); - } - } -@@ -95,9 +95,9 @@ tef_header(xg_string args, const QXmlStr - { - route = route_head_alloc(); - foreach(QXmlStreamAttribute attr, *attrv) { -- if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("Name"), Qt::CaseInsensitive) == 0) { - route->rte_name = attr.value().toString().trimmed(); -- } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Software"), Qt::CaseInsensitive) == 0) { - route->rte_desc = attr.value().toString().trimmed(); - } - } -@@ -248,20 +248,20 @@ tef_item_start(xg_string args, const QXm - QString attrstr = attr.value().toString(); - QByteArray attrtext = attrstr.toUtf8(); - -- if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) { -+ if (attr.name().compare(QString("SegDescription"), Qt::CaseInsensitive) == 0) { - wpt_tmp->shortname = attrstr.trimmed(); -- } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("PointDescription"), Qt::CaseInsensitive) == 0) { - wpt_tmp->description = attrstr.trimmed(); -- } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 && -- attr.value().compare("true", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("ViaStation"), Qt::CaseInsensitive) == 0 && -+ attr.value().compare(QString("true"), Qt::CaseInsensitive) == 0) { - wpt_tmp->wpt_flags.fmt_use = 1; /* only a flag */ - - /* new in TEF V2 */ -- } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Instruction"), Qt::CaseInsensitive) == 0) { - wpt_tmp->description = attrstr.trimmed(); -- } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("Altitude"), Qt::CaseInsensitive) == 0) { - wpt_tmp->altitude = attrstr.toDouble(); -- } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) { -+ } else if (attr.name().compare(QString("TimeStamp"), Qt::CaseInsensitive) == 0) { - /* nothing for the moment */ - } - } ---- a/magproto.cc -+++ b/magproto.cc -@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portna - */ - QString exten = QFileInfo(curfname).suffix(); - if (exten.length() > 0) { -- if (0 == exten.compare("upt", Qt::CaseInsensitive)) { -+ if (0 == exten.compare(QString("upt"), Qt::CaseInsensitive)) { - extension_hint = WPTDATAMASK; -- } else if (0 == exten.compare("log", Qt::CaseInsensitive)) { -+ } else if (0 == exten.compare(QString("log"), Qt::CaseInsensitive)) { - extension_hint = TRKDATAMASK; -- } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) { -+ } else if (0 == exten.compare(QString("rte"), Qt::CaseInsensitive)) { - extension_hint = RTEDATAMASK; - } - } ---- a/unicsv.cc -+++ b/unicsv.cc -@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, in - static status_type - unicsv_parse_status(const QString& str) - { -- if (str.compare("true", Qt::CaseInsensitive) == 0 || -- str.compare("yes", Qt::CaseInsensitive) == 0 || -+ if (str.compare(QString("true"), Qt::CaseInsensitive) == 0 || -+ str.compare(QString("yes"), Qt::CaseInsensitive) == 0 || - str == "1") { - return status_true; - } -- if (str.compare("false", Qt::CaseInsensitive) == 0 || -- str.compare("no", Qt::CaseInsensitive) == 0 || -+ if (str.compare(QString("false"), Qt::CaseInsensitive) == 0 || -+ str.compare(QString("no"), Qt::CaseInsensitive) == 0 || - str == "0") { - return status_false; - } diff --git a/debian/patches/gpsbabelfe-name b/debian/patches/gpsbabelfe-name deleted file mode 100644 index fa86e886e..000000000 --- a/debian/patches/gpsbabelfe-name +++ /dev/null @@ -1,12 +0,0 @@ -Rename gpsbabelfe binary. ---- a/gui/app.pro -+++ b/gui/app.pro -@@ -46,7 +46,7 @@ win32 { - TARGET=GPSBabelFE - QMAKE_LFLAGS_RELEASE += -static-libgcc - } --unix:TARGET=gpsbabelfe-bin -+unix:TARGET=gpsbabelfe - mac:TARGET=GPSBabelFE - - FORMS += aboutui.ui diff --git a/debian/patches/gpsbabelfe_disable_version_check b/debian/patches/gpsbabelfe_disable_version_check index c1a94d4d3..60bd3a299 100644 --- a/debian/patches/gpsbabelfe_disable_version_check +++ b/debian/patches/gpsbabelfe_disable_version_check @@ -18,15 +18,15 @@ Disable version mismatch check. --- a/gui/preferences.cc +++ b/gui/preferences.cc -@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent +@@ -43,7 +43,6 @@ Preferences::Preferences(QWidget* parent, QList& formatList, ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); - ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. - if (VERSION == QString("1.4.1")) + if (VERSION == QString("1.4.1")) { babelData_.ignoreVersionMismatch_ = false; -@@ -84,7 +83,6 @@ void Preferences::acceptClicked() +@@ -87,7 +86,6 @@ void Preferences::acceptClicked() babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); @@ -36,7 +36,7 @@ Disable version mismatch check. --- a/gui/babeldata.h +++ b/gui/babeldata.h -@@ -66,7 +66,7 @@ public: +@@ -67,7 +67,7 @@ public: startupVersionCheck_(true), reportStatistics_(true), allowBetaUpgrades_(false), diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version index f453bf125..59affa106 100644 --- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version +++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version @@ -18,15 +18,15 @@ Disable check for newer versions on start. Anonymously report usage data. --- a/gui/preferences.cc +++ b/gui/preferences.cc -@@ -39,7 +39,6 @@ Preferences::Preferences(QWidget* parent +@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList& formatList, { ui_.setupUi(this); - ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. - if (VERSION == QString("1.4.1")) -@@ -81,7 +80,6 @@ void Preferences::acceptClicked() + if (VERSION == QString("1.4.1")) { +@@ -84,7 +83,6 @@ void Preferences::acceptClicked() formatList_[i].setHidden(item->checkState() == Qt::Unchecked); } @@ -36,7 +36,7 @@ Disable check for newer versions on start. } --- a/gui/babeldata.h +++ b/gui/babeldata.h -@@ -63,7 +63,7 @@ public: +@@ -64,7 +64,7 @@ public: upgradeErrors_(0), upgradeOffers_(0), runCount_(0), @@ -69,7 +69,7 @@ Disable check for newer versions on start. Visit Website... --- a/gui/mainwindow.cc +++ b/gui/mainwindow.cc -@@ -147,7 +147,6 @@ MainWindow::MainWindow(QWidget* parent): +@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX())); connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX())); connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX())); @@ -77,7 +77,7 @@ Disable check for newer versions on start. connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)), -@@ -206,19 +205,7 @@ MainWindow::MainWindow(QWidget* parent): +@@ -234,19 +233,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) //--- Restore from registry restoreSettings(); @@ -89,7 +89,7 @@ Disable check for newer versions on start. - } - - if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) { -- VersionMismatch vm(0, babelVersion_, QString(VERSION)); +- VersionMismatch vm(nullptr, babelVersion_, QString(VERSION)); - - vm.exec(); - babelData_.ignoreVersionMismatch_ = vm.neverAgain(); @@ -97,7 +97,7 @@ Disable check for newer versions on start. } //------------------------------------------------------------------------ -@@ -1021,10 +1008,6 @@ void MainWindow::applyActionX() +@@ -1072,10 +1059,6 @@ void MainWindow::applyActionX() //------------------------------------------------------------------------ void MainWindow::closeActionX() { diff --git a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting index d161aaed9..6cd4c2007 100644 --- a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting +++ b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting @@ -1,7 +1,7 @@ Make statistics reporting an opt-in option. --- a/gui/babeldata.h +++ b/gui/babeldata.h -@@ -64,7 +64,7 @@ public: +@@ -65,7 +65,7 @@ public: upgradeOffers_(0), runCount_(0), startupVersionCheck_(true), diff --git a/debian/patches/htmldoc-location b/debian/patches/htmldoc-location index bf2d596c9..0bdf6fccc 100644 --- a/debian/patches/htmldoc-location +++ b/debian/patches/htmldoc-location @@ -5,22 +5,15 @@ */ #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@" -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-@DOCVERSION@" -+#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/htmldoc/index.html" ---- a/gui/help/gpsbabel.html -+++ b/gui/help/gpsbabel.html -@@ -1,3 +1,3 @@ -

This is the local help. It currently isn't very helpful.

--

The online help -+

The online help - is mo betta.

++#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/gpsbabel.html" --- a/xmldoc/gpsbabel_man.xml +++ b/xmldoc/gpsbabel_man.xml -@@ -79,7 +79,7 @@ or as the backend for other tools. Display help that is more exhaustive than this page. If format is given, provide help for only that format. -Lists of filters and formats are given in the doc at http://www.gpsbabel.org. -+Lists of filters and formats are given in the doc at /usr/share/doc/gpsbabel/htmldoc/. ++Lists of filters and formats are given in the doc at /usr/share/doc/gpsbabel/. See Also diff --git a/debian/patches/series b/debian/patches/series index 89d4024e5..74aa6eded 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,3 @@ gpsbabelfe_disable_version_check gpsbabelfe_opt-in-for-usage-data-reporting gpsbabelfe_do-not-check-for-newer-version htmldoc-location -gpsbabelfe-name -use_minizip -fix-qt5-build diff --git a/debian/patches/use_minizip b/debian/patches/use_minizip deleted file mode 100644 index 7874090a6..000000000 --- a/debian/patches/use_minizip +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -120,7 +120,7 @@ LIBOBJS = queue.o route.o waypt.o filter - src/core/usasciicodec.o\ - src/core/ziparchive.o \ - $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) --OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ -+OBJS = main.o globals.o $(MINIZIP) $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -